bitkeeper revision 1.905 (40a3a6de5FuSwJGHH_WcDAjtx8enEA)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 13 May 2004 16:48:30 +0000 (16:48 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 13 May 2004 16:48:30 +0000 (16:48 +0000)
commit5a258f039214b3d6cc25477ba02a48ee3df14732
treec4cc156ecd19c0e5bca7cfee069476113a50f6f6
parent11c23eec7386c4c81ba99214006a0676d6b3372f
parent49c6b7cad5d16552fcc86a7aac8e2a505abd12a3
bitkeeper revision 1.905 (40a3a6de5FuSwJGHH_WcDAjtx8enEA)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xeno.bk
xen/common/domain.c
xen/common/memory.c
xenolinux-2.4.26-sparse/include/asm-xen/hypervisor.h